projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
53b59d2
a0357d5
)
bitkeeper revision 1.1159.1.502 (41c9f250UPMNaCe07pXLSQ_YQhUUnw)
author
kaf24@scramble.cl.cam.ac.uk
<kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 22:16:48 +0000
(22:16 +0000)
committer
kaf24@scramble.cl.cam.ac.uk
<kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 22:16:48 +0000
(22:16 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
1
2
linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
Simple merge